Improved flexibility on generating validation plots with mixed recalibration/realignment inputs. Fixes #438