More cleanup

Signed-off-by: Ken Barber <ken@bob.sh>
Remove some more complication

Signed-off-by: Ken Barber <ken@bob.sh>
Centralized memoize

Signed-off-by: Ken Barber <ken@bob.sh>