Are we still considering the syntax sugar from @thestinger's RFC to potentially make this less horrifying?