Great question- I started doing that as well since I didn't get an additional 1099-R. So far it had been working, until I got the message indicating the needed 8915f form wasn't available and to revisit that section later.
