FIX: Deal with indices more cleanly for numpy 1.8