Remove unnecessary indirection