Clearly wasn't thinking there. I backed out of those changes and applied -moz-border-box to the spaces via CSS.