decomposer.cc: decompose: minor clean-up