Style & robustness fixes.