Large commit of pointless changes which I am apparently forced to do.