spring: minor cleanup; rework parent/child context management