sf/SmallStep: Small improvements.