I agree having our own macro or just a function would be a good step 
forward, because the code duplication here feels a bit wrong.