Auto-generated block marshaler classes will now become inner classes of the class using them so that MarshalerLookup searches the outer class for return and parameter type marshalers. (#276)