Fix for missing generic-contact in upstream, and whitespace.