Changes due to Agda issue 953.