Fold cases where we are doing CIncBase as well as CIncOffset.
Fix a test.