Updated with post 3.0.6 commentary.