Strip more code out of the inner loop