I've submitted a patch for the first chunk of work in TIP 34 which is moving code from the www pages into includes. Hopefully it makes the intent of the TIP a bit clearer.