Replace totoro-common with utilx.
Update version of dependecy on utilx.
Replace mark() with utilx.generateLine().
Replace isNonEmptyStr() with utilx.isNonEmptyString().
Replace isNonEmptyStr() with utilx.isNonEmptyString().
Extract .Cmsparse() from .MacroCall().