Cleanup a few minor things.
#16862: remove outdated statements about Stackless.
#16862: merge with 3.2.
#16862: merge with 3.3.