Assorted fixes in the enum command implementations.