@ctweney I'll comb through the code to get rid of stuff like this before a Real Life PR.