minor cleanup and prep for incoming-set changes

minor cleanup and prep for incoming-set changes