Remove special cases from layout.gap()