Drop CLI plugin flag and just use service loader.