Shuffle things around from original skeleton to match actual use.