More cleanup on oregoncore and oregonrealm.