Removed dependency on marrow.util; other minor cleanups.