SAP seems to work completely, private methods can still be reworked to
be more generic