@cvrebert: check the refactor patch. If that's ok with you, I'll squash those two.