Cleanups in spray-can and spray-http