Clean up analysis task class lookup.
Spec coverage tweaks.