more abs and scheme cleanups