some safe cleanup while investigating Sentence constructor's calling contexts
more updates