Can we push the `@attributes.nil?` check down into the `expected_attributes?` method to DRY things up a bit?