Improve handling of constants by universal backend