Separate substitution finder and definition finder