Simplify SingObj code
Fix gapwrap to also handled already wrapped qrings correctly