More work on descriptor Calc function.