make code folding setup less brittle