More work on migrating the APPL importer to Swift.