Better separation of zero/one and two column cases