Un-bare a couple of excepts, thus DOing some TODOs... and then add another TODO