Minor cleanup as of @dbu's review