Adhere to convention, fix implementation.

Parentheses have been added where appropriate, and `#border` is now
implemented in terms of `#border!`, which uses `#replace_canvas!` in
the interest of performance.