honor @grid-columns by un-hardcoding grid classes; fixes #9436
tighten up a bit by removing now-redundant/unnecessary comments