Tidy extensions and imports. Simplify Attribute and `With` instances.