Moved some definitions around.