Minor ctx refactoring.