Streamlined options for greater clarity

Options in all selection statements have been streamlined for greater
clarity and consistency.