Get rid of unnecessary construction.

@pphaneuf 
What's the deal with all this correct spacing? :wink: