Same as before: avoiding -prefic-pic issues. Also, catch some minor snafus found in the previous commit. With this, make distcheck passes again :)