Fix lint errors introduced in previous commits, and 'fix' Makefile.

I managed to commit to master changes with lint errors. This commit
fixes those lint errors, but also changes the Makefile so that the
Makefile 'test' target depends on the 'lint' target, so that I won't
make this same mistake in the future.