Applied suggestions from Traun in PR #477.