Minor clean ups. Still thinking how to do hierarchical parsing while keeping visitor pattern.