Cleaned up mostly FillinNode.