WIP on AQL fluent API - implement return statement and refactor some context logic.