We teach both methods at UPT, which helps confuse the students. I always try to point out the ways the two are similar. What we call parallel is still considered direct by the AIM, and that the AF just gives you more freedom on what you can teardrop.
I have heard there is a new 11-217 on the way with significant changes as well as some big changes to General Flight Rules as well.
I just hope we can get back to 60-16 and 51-37.