Issue #52: minor cleanup