Some cleanup for PTH vs SMD version differences.