Fix for when/unless.