Small code cleanup, no change in behavior

TBR: @terrylucas