Make use of shortcuts for mpi_lock/unlock almost everywhere.

    This is a pure style/readability change. It consequently makes use of
    shortcuts for calling locking routines depending on whether they are avaliable.
    IMO this enhances the readability of the code significantly as conditional
    compilation blocks strewn around the code are significantly reduced.

Author: vehre