s3_no_delete_*: more tweaks

Signed-off-by: Joe Buck <jbbuck@gmail.com>