Re: [PATCH v4 3/5] sf: Tidy up code to avoid #ifdef