Removed package locking system as it is too cumbersome
Added primitive implementation-function definition macros.