Follow up on folders code review

Follow up on outstanding review at https://github.com/oaeproject/Hilary/pull/1031