I'd rather not add them for psr4 at least, because that's just more
stuff to get rid of.