Moved some val definitions.