Slight cleanup in sponsor code.