Replace MAX_VALUE with function call... simplifies 5000-series device support