Add more categories, replace ALIST-GET with ASSOC-VALUE.
Supersedes Issue #11