Fix bugs in stm_m4sugar.m4.