Parameter map implementations and other missing commits.