Cleaned up 'equals' in various collection elements to lessen NPE's everywhere. Its far less optimistic but less noisy now