Fixed Habbie's suggestions (https://github.com/PowerDNS/pdns/pull/1220#issuecomment-32884985)