@IgorMinar does that look alright, or is that sort of conditional a bit nasty? It keeps the unwrapping to a minimum, at least