Fix bugs in parsing splats and blocks together