Match up types
Remove dangerous array slice parsing