Improve #collapse to work with block shorthand (e.g., &:+)