Some further tweaks to move towards strict mode for hittable.