Cleanup

This removes some unneeded code and makes `with-elapsed-timer` "better behaved" (i.e. hygienic and returns last form; this won't make a difference in current use of the macro).