Fixed WoM-style config support. Fixes #291

Also reorganized WoM-specific code while I was at it.