Hey, it's definitely true you can extract that part out. Missed that. It's enough to fetch the attribute value.

Change it however you like. I thought to contribute a couple of changes as I had to work with the shim. :)