Meanwhile I've consolidated things in this check-in:

For more details see the discussion in