Relaxed some type constraints.