Readds Semi-LEX to simplify syntax (a bit)