stereo.cc: Minor cleanup
maproject: More reconciliation