Cleaned up splice generation.
Made splices work.