I’d like to put in a vote for making existing pages page includes of master/child pages (as I described in other comments in this post). I have been using it for all master/child pages and it has advantages including being able to use the primary page with or without the Master. Plus for existing pages you don’t have to do any code conversion.
