Update: Eclipse 3.6 is *a lot* easier. They finally fixed this. Just go to Project > Properties. Then go to Facets and you can do everything from there.
Ever wondered why "Convert to a Dynamic Web project..." is under the Project Menu in Eclipse?
It is there for one reason and one reason only: