Addressing the issues Phillip reported on pull request #403