NEP: Address more of Stéfan's review comments
NEP: Address more of Stéfan's review comments

pdebuyl/numpy,mhvk/numpy,rgommers/numpy,mhvk/numpy,charris/numpy,endolith/numpy,anntzer/numpy,pdebuyl/numpy,mattip/numpy,pdebuyl/numpy,charris/numpy,anntzer/numpy,charris/numpy,rgommers/numpy,numpy/numpy,rgommers/numpy,rgommers/numpy,numpy/numpy,numpy/numpy,anntzer/numpy,mattip/numpy,endolith/numpy,endolith/numpy,charris/numpy,mattip/numpy,pdebuyl/numpy,anntzer/numpy,mhvk/numpy,mhvk/numpy,endolith/numpy,mattip/numpy,mhvk/numpy,numpy/numpy