Added staging support and portlint cleanups.