Mostly cosmetic spec cleanup