Add support for many more kinds of splices