Better. Still a tad weird, but I like that best (assuming the condition clause is fixed).