[master 13/17] Get rid of some requirements that should not be necessary.