Improvements to statement/expression digression, plus other touch-ups