Make SmallStep module a bit more idiomatic