Eli, are you OK with this (slightly) incompatible change?