Fix up commit.

+ Reduced duplicate parsing code.
+ Fixed visibility of parsing modules.