Reformulated nested friends handling and added (r)begin/end members to string
Authored by: fbb 2011-05-25
Parent: [r537]
Child: [r539]