why did you change this line?  the previous version seemed better -- no reason to create an empty Seq that we're not going to use