States, templates, and decltypes removed.