Encode true/false and numeric values better.