No point keeping it around. Also, simplify idempotence of masquerading setup. Follow-up to issue #48.