+literal constant cleanup