Cool, this is cleaner. But keep in mind that eventually I would like to pull `border` out entirely.