Use promoted booleans.

    And fix renaming issue in imports.