De-mod-ify some stuff enum scoping makes possible

Not strictly necessary, but fun, and it fixes a warning.
I also improved it a little while I was at it.
What can I say? It just happened.
Fix an unused result error.