simplify core frank rules by moving effect annotations to thunks
renaming and rearranging
minor simplification
oops
tweak