Use a substitution for the Numpy version so we don't have to remember to
update it in multiple places.
Remove another Numpy 1.4 workaround