Some style/const/consistency fixes.