Handle cases where we can't get the fid's key a bit better, and build up the S3 keys a little bit more sane-ly. This thing can't handle deletes at the moment.