FIX: Backwards compatibility layer was not handling constants that ended
with 's'