Removed value classes from encoding helpers.