Clean-ups found during review of PR #43