Tidy up builtins, ido and complete configs