Removed uncessesary indirection.