Particle combiner fix debug msg seg fault

Fixes an issue only exposed when debug printout is enabled, due to lack of protection for an empty container.

Also add a few drive-by clean ups.

FYI @tnanut