fix indentation conversion; fix unwrap type inference