hate to nag, but I'd love to have https://github.com/puppetlabs/facter/pull/2480 and https://github.com/puppetlabs/facter/pull/2511 but I'm a bit stuck....