Better support default variables and update to go1.3.3