Follow up on #284

Some minor code review items remain.