Shrinking, plus some reorganization…

…and `syntax` convenience
Fixed imports and type variables

[none]
Some additions

[none]