Tidied up the code around setting keys in the recipients hash.

- There's no need to create a key for an empty variable.