Organize includes.
Replace instances of conditional by Dune's SelectType.

The uses of conditional were unqualified and thus could not work.