Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: Stefan van der Walt <2c764409bdbff8137a84f6027125ff7980d2d1e8@gmail.com>
charris/numpy,endolith/numpy,mattip/numpy,numpy/numpy,anntzer/numpy,mhvk/numpy,mhvk/numpy,pdebuyl/numpy,numpy/numpy,charris/numpy,anntzer/numpy,pdebuyl/numpy,rgommers/numpy,mhvk/numpy,rgommers/numpy,anntzer/numpy,rgommers/numpy,mattip/numpy,mattip/numpy,endolith/numpy,anntzer/numpy,endolith/numpy,mhvk/numpy,charris/numpy,rgommers/numpy,mhvk/numpy,pdebuyl/numpy,mattip/numpy,pdebuyl/numpy,numpy/numpy,charris/numpy,numpy/numpy,endolith/numpy