[lerxst2112]

This is definitely much cleaner. I didn't think the first patch was necessarily a problem, but it was complex enough to make me worried about using it without a ton of testing.

I'm excited to see this in action.