refactor: make the use of dependent and independent context explicit#972