Paches pushed as 16418a974f98acb22fbef1a8789b794bb8f6fabe and following
with a few modifications (missing 'file-name', typos, etc).
Thanks.