clean up 'oneofmany' hack
Merge branch 'master' of https://github.com/ld4apps/lda-serverlib