Fixed an bug where some logic should have been in the parser but was in the commons library.