Mark uberlong lines more subtle & fixing cases in unite