Removed useless layer of indirection.