Used linter to find a few more syntax problems.