smurf: Improvements to pol2cat