[stefil-devel] Swank integration fixes