Convert function to expression function, tidy another
Authored by: sangwine 2022-01-09
Parent: [r101]
Child: [r103]
