Re #1610: minor corrections, code cleanup