Patches pushed as 003b91298a8edcce26d971f77567620f55c905a4 and following
with a few modifications (indentation, descriptions, sorting inputs).
Thanks.