- Remove ONLY_FOR_ARCHS (x64-specific bits are guarded now) - Cleanup up patch hunks that were included upstream - Fix a typo and generally include port description Requested by: upstream [*]