Cleanup of splice code.