reverting some ugly changes with suffixes on literals