Fix some post-merge stuff.

- The merge somewhat garbled a couple files, just got it to build
again. The shooter now passes all its tests.
3 files changed