Properly reset attributes when using underlines

Face attributes from the original `defface` definition of the face must be
reset when using underlines, to get rid of additional foreground/background
coloring.

Follow up to #112