Make registration types and ownership consistent. Run tidy.