You're right, there's a better way -- I'll push another commit. Wait to merge!