Fixes some issues with control values not being read back correctly. Originally committed to SVN as r6533.