bc6b848 should make things a bit nicer.