More alpha-quality implementations (and other cosmetic changes)