Remove some indirection