Simplify by using local function names where possible.