Discussed during review of #1239. Open question as it will potentially break some existing implementations.