WIP: Additional un-numpying (marginal speedup)