Some more bin_or_sbin consolidation