Preserve newlines nicely, handle trailing newlines

[langfield]

This makes slight changes to the parser in pursuit of having push . clone and push . pull both be the identity function on collections.