@aljoscha: Could you review this change? (I committed it already to master) ... but it would be good if you can confirm my approach.