Collect similar argument terms after factorization

[Martin Sandve Alnæs]

There's a lot of structure that can be reconstructed after factorization has torn the form apart. Try to collect as much as possible by looking at modified argument properties.