Remove some completed TODOs
Simplify facet creation by using a simpler DSL and ensure all elements can be enhanced in a facet