Merge "style fixes:scan.c scan_orders"