Fix const correctness & cleanup superfluous semi-colons

Could this be a reference since it won't be NULL?