massaging code to play nice with other code.