Removing annotations, adding System F typing, finished substitution
meh