Just a little clean up on the parsing code.