Update full_mako to be generally equivalent to full_toro