More lame improvements

See lines 603-605 and 886-888 in lame/libmp3lame/lame.c for what the
further digging turned up.