Cleans up the coerced types.
Merge branch 'master' into sre-description
Cleaned up type coercions.