PARSER: re-factor and re-organize specs.