Further style fix-ups.