(Issue 732) Minor code cleanup