Revise internals for #82