@jonathanSwilson They may change quite a bit between now and 3.6 final. core.trac.wordpress.org/ticket/23333