Issue #451: Refining formal members and TODOs