Fair enough. Now I'll just have to figure out how to remove this diff from the PR. :-) Should have it sorted out tomorrow after I've had my tea.