More refactoring (helpers). Default context detected.