I spent an afternoon trying to refactor ours awhile ago (on 1.0.0) but ended up with no solution I was happy with.