I agree, this could be a lot shorter by using that construct.