deal with square boluses via dual-wave by changing type instead of fabricating zero normal component

@jh-bate ready for review and local testing.