Clean up parse analysis a  bit