Recanonicalize all-in-one mode to "single binary" support