Further reduce duplication in featureContext