Modified all declarative functions to expression functions.