Misc cleanup to minimise diff to fork point: 481455737ddc09c0c4212f07afa6f5805d3ff4d6