Added a couple of other cases where the gaincal could be recognized.
Tweaked.