Cleanup for unwrap continuations
Fix some signed/unsigned comparison warnings