Cleanup for #228.