Incorporate jonludlam's cleanups

Signed-off-by: David Scott <dave.scott@citrix.com>