Fix up for building in gcc 4.8 (and inline)