[PATCH 057/171] Correct SPL uses of CMD_SF