swaroop: partial rework of SPL management.