A little clean up

After #965 these are a few follow up items.

@rhyolight - look ok?