clean up some warning-causing ugliness