Fix spelling mistakes and white-spaces.
Switch to new simpler convention for control of beans creation in straps.js