Fix: Don't shell-escape macros by default.
Fix: Add missing locks.