Remove remaining assumptions of analysis fact type