More DRY changes to buildtype examples