Add more case-insensitivity.