Fix #608. Fix merge when one of the series doesn't yield any points
Cleanup (Thanks, @freeformz)

Close #618. Close #617. Close #616. Close #615. Close #614