OK. I simply observe that our code base has a rich mix of different programming styles :-) and it will be an interesting exercise to make it more consistent over time. However I reckon that now the important thing is to add the functionality/tests that we need and not worry *too* much about minor consistency. It will be fun to fight/edit it later :).