Refactor types+coercions (esp. for easier import)
v1.15.0-SNAPSHOT