2a98efc Simplify extension type handling.