Replace compound-literal with declaration-initialization