Added some additional keyword checks for auto handling with variable names.