Self-review plus fixed makefile order whoopsie.