Extensions homogenization, clened up.

Rebased and cleaned up version of extension homogenisation. I will give some comments that should be fixed before merge now.
Does this still make sense ? The comment in an optional argument like that is weird.