#2: Minor cleanups
Let's accept that this method won't be inlining; gcc's judgement is probably right.