Simple cleanup and modernization.

Just some stuff that was getting in the way before I go and do status page stuff.

:eyeglasses: @rram