Making enum options smarter.
Release 1.5.4.