minor refactoring
faster top-level-completion
refactoring + delayed completion