Generate an enumerated, keyed object, rather than a naked object

For application-wide consistency, as per #191.