Minor sreamlining of some internal code using class lst...