398: refactored all ... swifted gallio