Bug fix in preparation of constructor declaration. New tests, might be beyond fully maximal abduction.