Integrate syntactical tweaks from nikipore.