A-ha! Proper work-around for gcc crashing bug