Cleaned up some code, fixed a broken test due to that cleanup, and unboringified the docs ;)

I even signed off on my own commit. What an asshole.

Signed-off-by: Brandon Aaskov <baaskov@fullscreen.net>