Further tinkering with apiary.