Make functions functions not constants