Clean up Makefile. Fixes #1. Fixes #3.