Merge updates about dir() with 3.3.