Adding missing forwarding headers
More work on mismatch, re-adding predicates.hpp