demo-shell: Better style
lib: change getter signature and remove off