Ticket 402: a bit of cleanup