Re-arranging changes to try and make the diff against the existing API definitions look nicer.