misc cleanup:

- prefer computed macros to hand rolling
- FIXTURES should reside on reopen
- quote consistency