Remove duplicate surround entries. Fix for #27