PAX ASLR: Upstreaming-related cleanup: Remove more cruft.