Fix client attributes so that hashes and arrays work correctly

[nward]

In d2885da I was changing if @var to if defined?(@var) and accidentally changed:

if @attributes.respond_to?('join')

to

if defined?(@attributes).respond_to?('join')

which obviously doesn't work.

This commit reverts that, and doesn't check check defined?(@attributes) several times.