#516. Minor clean up.