fix(expression_extractor): correctly support @ mapping spec, remove old specs