Refactor types+coercions
v1.15.0-SNAPSHOT