Dhm/acid aside

@cpennington review (incorporates the other PR and I may should move some of these into that other one)
I think I copied it from `handler` (grin). Let me see if I can figure out something clearer.