Made the new code more merge-friendly with the EQEMu repo.