PropertiesBundle: factor some more code

And it could be factorized even further.