Removed unneeded indirection of definitions