Move more syntax methods into functions.