I'm not sure if these expect a specific context or not, but should we provide the correct navigator ala https://issues.apache.org/jira/browse/CB-2956