While clunky, I think what you suggest is the best method.