I think it is OK, for agility, to bundle multiple trivials into one.   When required (like duringAskMode), we should definitely separate them out.