Yeap, that would be super awesome and will clean up the code real nicely.