Cleaned up a couple of things I missed in that last refactoring commit. Builds now.