Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: Matthew Brett <f3bc2363288f931098d8ee6b9e7bc6ab07130994@gmail.com>

matthew-brett/delocate,matthew-brett/delocate,matthew-brett/delocate