Switched splits and fixes for a safer exec order.