Improve blockquote spacing logic and simplify variable definitions so
that the border color is inherited by default.