Removed pointless indirection