Update some of the code for use with PR228. Changes are temporary and fleeting, like happiness.