Clean-up and optimize alpha test code.