Max,

Thanks for your review! I've fixed all the comments you've left. The
branch is force-pushed.

--
Best regards,
IM