core.completion: optimises