Removed dictionary switch statement

Switch statement was causing problems in parsing mode.
Switched to strict elif branches.