long Enum format, to help auto-complete; tests now seem to work better