Minor cleanup of #162.