A bit of cleaning up to start addressing gcc compat