Removing variable indirection for simple steps