Performance fixes for prototype changes.