[ci skip] Tidied up pull request.