Stripped fold markers
Fixed problems uncovered by warnings.