We can do that as a separate PR: http://manage.dimagi.com/default.asp?69704