Add ;;s to make Freek happy.
Better parsing of integer types.

Patch by Freek with modifications by Robbert.