Fix swap! and add subs to fix #-postfixed symbols