Cleaned up the building of WhoisEvents