Revert some warning fixes because rbx-19mode fails.