Add support for non-calls, and add "the"