Remove uses of syntax-map and replace them with stx-map