autocomplete tidying. export rewrite.