Sorted issues with expanding numeric expressions.