re-order includes so its easier to strip out ASAP for some builds
include banners in all builds
filter/map argument validation should result in promise rejections.