Finish the obfuscation work started on e58e895.

@basepi this one was also needed.