Preliminary non-zip location support; update casting convention