It compiles.
Still compiles, but probably isn't linking to the right stuff.
I guess we should be resigned to separate compilation now.

Revert "Still compiles, but probably isn't linking to the right stuff."

This reverts commit 7b2dc3ed86a1ca83fdef1aa10df53dd70d232168.
Everything seems OK... a bit of semantic meaninglessness in one
function though.