Replace gratuitous use of LOOP with MAPC

Fixes #35.