Merge more changes from trunk.
Renaming parse methods and not outputting empty document info. Also, some other changes that don't really apply.