And lastly, redo this vital optimisation that David had to remove earlier. Saves a few bytes.