More retooling/refactoring to numpy arrays.