Refactor proxy-disabling a bit