Note that one or both above suggestions could be addressed in a separate pull request