Thanks for the guidance; I've pushed this into the latest build.

Let me know if there's anything else you notice!