More fullyQualifiedPath cleanup.