Use UFCS and fixup build script.