Diff best viewed with -b option

- avoid the second call to VCC_SymbolGet(), unless necessary
- reorder from simple to complex

Ref 7ec28f1a