Yes, this is is definitely a candidate for refactoring. I do not get your point exactly. 
Since this is merged, I will file a launchpad bug to continue discussing.