More definition tweaks.