Yeah - I did it the way you suggested. Also cost me some line length, 
but oh well. :D