Remove some code duplication. Also remove some comments that no longer apply since x86_32 was dropped.