I had missed these, @tomvand. Could you use a bit more explanatory naming and/or comments?