rejiggered contexts a little to be more sane