minor, coerce in a nicer spot
minor, get rid of some now unnecessary unwraps / casting