Minor changes before operator precedence implementation

About to try Shunting-yard, so better back up