Hyper-happy stuff got dropped in the update of items to class-based. Restoring it.
General cleanup.