Merge "Distinguish FP and integral constants in LVN."