Auto generation simplified a bit.