hey I have a commit that might simplify this - I'll be landing today