Updated to take advantage of autosynthesis and literals.