Fix incorrect disposition testing and get rid of of a related hack that is no longer needed.