Some additional tweaks meant to move towards strict mode.