Finish cleanup after gcc 4.8 compatibility change