Stricter, improved and less buggy obfuscator