Add EXPENSIVE prereq to sharness tests

This was discussed in #283.

The first 2 commits are cleanups.