[eclass] Extend hack.
[eclass] Fix extended hack.
[eclass] Further 5.1.0.1 madness.