more idiomatic `if`
actually test `extra_context`