fixups related to the big change in acbellgithub's 24828059066a77f56be6bec002a605c5d95af266
more cleanups for 24828059066a77f56be6bec002a605c5d95af266 for filters.hexbin