Added some field initializations; reorganized and disabled some interpositions that seem unnecessary.