Some fixes after covering `this` up.