Minor convention changes.