Lots more annotation.
One conversion to enum.