28c4a5586e
(And remove a boatload of duplicate imports from the typestate files.) Name collision checking in local scopes will follow soon.