[PBQP] Tidying up as per Dave Blaikie's suggesions for r220642.