I thought the function in ParseTreeFactory pretty much handled these cases?