Fixed RHEL 5.10 support. Added helpers as sugar.

So this issues fixed.
Is this the magic? Can't we just include it always?