Fix reinterpretation of --current as -T so that it's only changed when it makes sense