Change Details

This is only an example snippet to show that obviously something could be simplified. Let me know if it is desired to go further or if there is a good reason why it is so complicated. Depend of your answer I will enhance this patch or abandon.