Fix dynamic returns getting precedence over lexical ones