Finish work on simple type parser