Good idea. Will raise as a separate pull request, because we do this all over the place.