clean up some ugly juggling with 'this'