Tighten up parsing so only correct syntax is accepted