A bit more cleanup for R15 emsgsize workaround