More tweaks to the old-style package name parsing