To the immense relief of nobody but myself, and whoever it was that had a reasonably cheap Piko Smartcontrol light in stock, the new control unit runs all my problematic loco's, both of them, perfectly with the added bonus that I can assign sometimes helpful symbols to function buttons so I don't forget which does what.