Cosmetic code changes to satisfy lint.