adjust to sh-macro-parser branch in mgv-core