New: Contextomator

and some cleanup