Cleanup assertions and move cosplay_patch handling to S;G