Small refactors.
Boom Wall Werror.