Handle timestamps correctly & ignore nil intermediates