Applied Mike's nice -d option thing.