Better comment stripping for Cassius #605