Fix the plugin parser not using the new GAPIL call names and reorganize GAPIL call code.