Get PRE/POST support mostly in place.