Refactoring patches

[Yuriy Skalko]

> If I looked at the correct patch (I do not follow this thread very closely), things like int const & should definitely be removed from the sources. If they did compile correctly, then I see no harm in replacing them by 'int' in declarations and 'int const' in implementation of non trivial functions.
> 
> So the patch is fine with me.
> 
> JMarc

Thanks. I've committed the patch.

Yuriy