bug #1919: get rid of some checks.