categoricals: Update style and modernize.