Finish the obfuscation work started on e58e895.