More input sanitization work.