Clean up some handler code and docs.