AC-7999. Add a bit more syntax checking.