Progressive cleanups, replaced user/metastate data hooks with scurvy wrapper.