[COMMIT] Pass the NOMODIFY argument to s-b-f-c-s in a few more cases