Generated with fixes recommended by Jakub K.