Add shortcut folds for simple cases.