Ahh, I see. It makes sense to have it here, then (instead of its original location after `_RawShell`). So I say leave it here is fine. For reviewing purposes, did you change anything, or just move it?