FIX: Miscellaneous errors (Philip); happy side effect: slightly better performance.