More re-arrangements to make gcc happy