Yep, that seems like an elegant solution.