Safeslinger: more simplification