Adding if lift. Adding scalariform. Minor cleanup.