Update for namespaced enum variants
Update for new coercion rules