This is needed as a previous commit changed some python int to numpy integer.

This will also make the optimization happen more frequently then before.