bml/common: more code simplification