Fix predicate generation analysis and simulated handling