Always include replacement character
Fix type fuckup
Port to codepoint ranges