Overhaul of p_unload to have more readable names.