#554: finishing numpy conversion