Fix some Acmlmboardish bugs I mentioned a while ago.