Yep. And we used all of the forms (W2, 1099R, etc.); we didn't just type amounts into the 1040 or the 1040X (sorry for not being clear on that).
