Fix #942: Make the BG/Q work with -O3