More simplification. Small perf bump.