A bit of cleanup from my rushed coding last night.  No behavioral changes.

Signed-off-by: Rick Minerich <richard.minerich@gmail.com>