spf/model: Minor clean-up.