Added assertion for iterable in bunch constructor. Cleaned up longitudinal matching.