Obfuscate-proof some more things