Completed ListOf key-value refactoring, fixes