Make b2g stuff require -b flag, rather than include it by default