BUG: remove second wrapping of BinShrink for scalars

Change-Id: I8942463100eb917a96825452cbce2807fe87c123