Most of RVM desugaring done in first draft, for TQ to check.