Fixed messy node container code.