Merge "Make extract_package() work for toplevel classes."