Fix rotation crash, minor cleanups

Bug: 32987577

Don't assume that Evaluator is recreated after rotation; it no longer
is.

In passing:

Factor out a small amount of redundant code. Fix comment typo.

Change-Id: I03da96adc549b577899cbbbf12bab6fcd9b866dc