fyi, got a lot done on this while travelling, but not yet complete - I've just committed my current set of changes for safe keeping. Once I finish that up I'll follow-up here w/ a more complete reply to the patchlist.