Moving type.
First step towards #357.