[[ Cleanup ]] Continued build warning fixes.