Whatever the details, I think this would be good to cleanup, and possibly at the GSS layer too. -- Luke