Minor adjustments to variable_orders & gpc_order checks. "Special thanks" to Tomas...