Yes, it's a bit more code but it feels less ugly.