Minor tweaks to keep the file size down...