Address Travis-CI complains about operator "".
Split-out irqsafe version and fix gcc-4.8 bugs..