factoring of the definitions of closure/fence/shifting

woohoo, looks tons simpler. I hope it's correct. No text update yet, but
this should help.