First pass at un-bitrotting things