Getting closer to sending my patch to CFEngine upstream....