Followup on US509: code review