Minor code-consistency changes