Ah, these were already committed in @2974c06
Make Questions more readable, hopefully.