More ASLR code cleanup