Fix handling of type-safe choosers and new display behavior. Fixes #186