Minor parser cleanup, and fix for division (/) handling.