fixup tarbert/spe10 duplicate code