Yes, this form is the original reason I started in on this refactoring project, and I almost forgot to include it. Doh! --Dfeuer (talk) 06:54, 3 February 2013 (UTC)